Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use common CSM baseimage #271

Draft
wants to merge 10 commits into
base: main
Choose a base branch
from
Draft

Use common CSM baseimage #271

wants to merge 10 commits into from

Conversation

EvgenyUglov
Copy link

@EvgenyUglov EvgenyUglov commented Jan 27, 2025

Description

Converting csi-unityto use the common dellemc/csm-base-image (which is based on ubi-micro) instead of the ubi micro image directly.

GitHub Issues

List the GitHub issues impacted by this PR:

GitHub Issue #
dell/csm#1691

Checklist:

  • I have performed a self-review of my own code to ensure there are no formatting, vetting, linting, or security issues
  • I have verified that new and existing unit tests pass locally with my changes
  • I have not allowed coverage numbers to degenerate
  • I have maintained at least 90% code coverage
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have added tests that prove my fix is effective or that my feature works
  • Backward compatibility is not broken

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Please also list any relevant details for your test configuration

build.sh Outdated
Comment on lines 33 to 34
echo $BUILDCMD build ${NOCACHE} -t ${IMAGE_NAME}:${IMAGE_TAG} GOIMAGE=$DEFAULT_GOIMAGE BASEIMAGE=$CSM_BASEIMAGE .
(cd .. && $BUILDCMD build --pull ${NOCACHE} -t ${IMAGE_NAME}:${IMAGE_TAG} --build-arg GOIMAGE=$DEFAULT_GOIMAGE --build-arg BASEIMAGE=$CSM_BASEIMAGE --build-arg GOPROXY=$GOPROXY -f csi-unity/Dockerfile.podman . --format=docker)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we get rid of this file altogether? Seems that it may have been part of some legacy build/test framework. Why not push things back into the Makefile?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. New cert-csi VolumeIO run also passed

@EvgenyUglov EvgenyUglov requested a review from donatwork February 1, 2025 00:33
podman-push: download-csm-common go-build
$(eval include csm-common.mk)
sh build.sh --baseubi $(DEFAULT_BASEIMAGE) --goimage $(DEFAULT_GOIMAGE) --push
podman build --pull -t $(IMAGE_REGISTRY)/$(IMAGE_NAME):$(IMAGE_TAG) --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) --build-arg BASEIMAGE=$(CSM_BASEIMAGE) --build-arg GOPROXY=$(GOPROXY) . --format=docker

podman-build-no-cache: download-csm-common go-build
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the go-build still needed since the build is being done in the Docker image build?


#
# Docker-related tasks
#
# Generates the docker container (but does not push)
docker-build: go-build
docker-build: download-csm-common go-build
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the go-build still needed since the build is being done in the Docker image build?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants